Move toProject into PageLinks for reuse This way its part of the common package and the server code can reuse it to generate a link into a project. Change-Id: Ia02adb4165e079aaf62be0c64126eeb6aa312762 Signed-off-by: Shawn O. Pearce <sop@google.com>
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java b/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java index 68156ed..5a85ef5 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java
@@ -18,6 +18,8 @@ import com.google.gerrit.common.data.ChangeInfo; import com.google.gerrit.reviewdb.Account; import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.Change.Status; import com.google.gwtorm.client.KeyUtil; public class PageLinks { @@ -63,6 +65,21 @@ return "q," + KeyUtil.encode(query) + "," + TOP; } + public static String toProject(final Project.NameKey proj, Status status) { + switch (status) { + case ABANDONED: + return "project,abandoned," + proj.toString() + ",n,z"; + + case MERGED: + return "project,merged," + proj.toString() + ",n,z"; + + case NEW: + case SUBMITTED: + default: + return "project,open," + proj.toString() + ",n,z"; + } + } + protected PageLinks() { } } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java index 0e8f556..9cacf3d 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
@@ -58,7 +58,6 @@ import com.google.gerrit.reviewdb.Patch; import com.google.gerrit.reviewdb.PatchSet; import com.google.gerrit.reviewdb.Project; -import com.google.gerrit.reviewdb.Change.Status; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.RunAsyncCallback; import com.google.gwtorm.client.KeyUtil; @@ -84,21 +83,6 @@ return "admin,project," + n.toString() + "," + tab; } - public static String toProject(final Project.NameKey proj, Status status) { - switch (status) { - case ABANDONED: - return "project,abandoned," + proj.toString() + ",n,z"; - - case MERGED: - return "project,merged," + proj.toString() + ",n,z"; - - case NEW: - case SUBMITTED: - default: - return "project,open," + proj.toString() + ",n,z"; - } - } - void display(final String token) { assert token != null; try { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectLink.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectLink.java index 92d1146..8ed7bf1 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectLink.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectLink.java
@@ -15,10 +15,10 @@ package com.google.gerrit.client.ui; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.Dispatcher; import com.google.gerrit.client.changes.ByProjectAbandonedChangesScreen; import com.google.gerrit.client.changes.ByProjectMergedChangesScreen; import com.google.gerrit.client.changes.ByProjectOpenChangesScreen; +import com.google.gerrit.common.PageLinks; import com.google.gerrit.reviewdb.Change; import com.google.gerrit.reviewdb.Project; import com.google.gerrit.reviewdb.Change.Status; @@ -34,7 +34,7 @@ public ProjectLink(final String text, final Project.NameKey proj, Change.Status stat) { - super(text, Dispatcher.toProject(proj, stat)); + super(text, PageLinks.toProject(proj, stat)); status = stat; project = proj; } 